Remove taskpanel

The new design doesn't have the task panel at the bottom; remove it.

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/configure.ac b/configure.ac
index e31698c4a454d6ab129cca63cdb789c4c7460b2e..571297a7bbdd848b7caa290ba47ef465360d12bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ PKG_CHECK_MODULES(TIDY, clutter-1.0)
 PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
 PKG_CHECK_MODULES(TRAY, gtk+-2.0)
-PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)
 # We require libgnomeui for generating thumbnails for recent files with GnomeThumbnailFactory.
 # We'll switch to using GnomeDesktopThumbnailFactory once the branch of gnome-desktop that contains
 # it becomes stable.

diff --git a/js/ui/main.js b/js/ui/main.js
index 603ac39f1627b8572dda007197a8793e91a189bf..cf834c9a348465b51f17d8fc208388ec728682aa 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -35,7 +35,6 @@ function start() {
     Gio.DesktopAppInfo.set_desktop_env("GNOME");
 
     global.grab_dbus_service();
-    global.start_task_panel();
 
     Tweener.init();
 

diff --git a/src/Makefile-taskpanel.am b/src/Makefile-taskpanel.am
deleted file mode 100644 (file)
index 2bdf4e9..0000000
--- a/src/Makefile-taskpanel.am
+++ /dev/null
@@ -1,17 +0,0 @@
-gnomeshell_taskpanel_CPPFLAGS =                                        \
-       -I$(top_srcdir)/src                     \
-       -DG_DISABLE_DEPRECATED                  \
-       -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-       -DG_LOG_DOMAIN=\"gnomeshell-taskpanel\" \
-       $(TASKPANEL_CFLAGS)     \
-       $(NULL)
-
-gnomeshell_taskpanel_SOURCES =                 \
-       gnomeshell-taskpanel.c  \
-       shell-panel-window.c    \
-       shell-panel-window.h    \
-       $(NULL)
-
-gnomeshell_taskpanel_LDADD = $(TASKPANEL_LIBS)
-
-libexec_PROGRAMS += gnomeshell-taskpanel

diff --git a/src/Makefile.am b/src/Makefile.am
index 8bc6bd39a911e75c6670b51d77a5cc115b7c8d8f..c9ad0d956d4814ad31c08ca97006711389c1eec6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@ include Makefile-tidy.am
 include Makefile-big.am
 include Makefile-gdmuser.am
 include Makefile-tray.am
-include Makefile-taskpanel.am
 
 gnome_shell_cflags =                           \
        $(MUTTER_PLUGIN_CFLAGS)                 \

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 96220294f4a385293b9f12bee6ccfae22a127db6..12a607f978c278cdc37887c3854c1e33e11255fd 100644 (file)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -123,19 +123,17 @@ def start_shell():
         top_dir = os.path.dirname(bin_dir)
         plugin = os.path.join(top_dir, 'src', 'libgnome-shell.la')
         typelib_dir = os.path.join(top_dir, "src")
-        taskpanel_dir = os.path.join(top_dir, "src")
         js_dir = os.path.join(top_dir, "js")
         data_dir = os.path.join(top_dir, "data")
     else:
         running_from_source_tree = False
         plugin = 'libgnome-shell'
         js_dir = os.path.join('@pkgdatadir@', 'js')
-        taskpanel_dir = '@libexecdir@'
 
     # Set up environment
     env = dict(os.environ)
     env.update({'GNOME_SHELL_JS'      : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + js_dir,
-                'PATH'                : '@MUTTER_BIN_DIR@:' + os.environ.get('PATH', '') + ':' + taskpanel_dir,
+                'PATH'                : '@MUTTER_BIN_DIR@:' + os.environ.get('PATH', ''),
                 'GNOME_DISABLE_CRASH_DIALOG' : '1'})
 
     if running_from_source_tree:

diff --git a/src/gnomeshell-taskpanel.c b/src/gnomeshell-taskpanel.c
deleted file mode 100644 (file)
index 5e9d217..0000000
--- a/src/gnomeshell-taskpanel.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#include "shell-panel-window.h"
-#include <libwnck/libwnck.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dbus/dbus-glib.h>
-
-static void
-on_name_owner_changed (DBusGProxy *proxy,
-    const char *name,
-    const char *prev_owner,
-    const char *new_owner,
-    gpointer   user_data)
-{
-  if (strcmp (name, "org.gnome.Shell") == 0 && new_owner[0] == '\0')
-    exit (0);
-}
-
-static void
-monitor_main_shell (const char *shell_name)
-{
-  DBusGConnection *session;
-  DBusGProxy *driver;
-  GError *error = NULL;
-  gboolean have_shell;
-  
-  session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  
-  driver = dbus_g_proxy_new_for_name (session,
-                                      DBUS_SERVICE_DBUS,
-                                      DBUS_PATH_DBUS,
-                                      DBUS_INTERFACE_DBUS);
-  
-  if (!dbus_g_proxy_call (driver, "NameHasOwner", &error, G_TYPE_STRING,
-                          shell_name, G_TYPE_INVALID, G_TYPE_BOOLEAN,
-                          &have_shell, G_TYPE_INVALID)) 
-    {
-      /* Shouldn't happen */
-      exit (1);
-    }
-  if (!have_shell)
-    {
-      /* Shell doesn't exist; either crashed or was restarted.  Just abort. */      
-      exit (0);
-    }
-
-  dbus_g_proxy_add_signal (driver,
-                           "NameOwnerChanged",
-                           G_TYPE_STRING,
-                           G_TYPE_STRING,
-                           G_TYPE_STRING,
-                           G_TYPE_INVALID);
-  
-  dbus_g_proxy_connect_signal (driver,
-                               "NameOwnerChanged", 
-                               G_CALLBACK (on_name_owner_changed),
-                               NULL,
-                               NULL);  
-}
-
-int 
-main (int argc, char **argv)
-{
-  ShellPanelWindow *panel;
-  WnckScreen *screen;
-  WnckTasklist *tasks;
-  
-  gtk_init (&argc, &argv);
-  
-  if (argc != 2) {
-    g_printerr ("Usage: gnomeshell-taskpanel [PARENT_DBUS_SERVICE]\n");
-    exit (1);
-  }
-  
-  monitor_main_shell (argv[1]);
-  
-  panel = shell_panel_window_new ();
-  
-  screen = wnck_screen_get_default();
-  tasks = WNCK_TASKLIST (wnck_tasklist_new (screen));
-  
-  gtk_container_add (GTK_CONTAINER (panel), GTK_WIDGET (tasks));
-  
-  gtk_widget_show_all (GTK_WIDGET (panel));
-  
-  gtk_main ();
-  
-  exit (0);
-}
\ No newline at end of file

diff --git a/src/shell-global.c b/src/shell-global.c
index 03ac1e9a5e9c42b2c3664f1243ac3d5021670e44..299208887435829c65f5549eee4eb07abb0d7d5c 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -760,20 +760,6 @@ shell_global_grab_dbus_service (ShellGlobal *global)
   g_object_unref (bus);
 }
 
-void
-shell_global_start_task_panel (ShellGlobal *global)
-{
-  const char* panel_args[] = {"gnomeshell-taskpanel", SHELL_DBUS_SERVICE, NULL};
-  GError *error = NULL;
-
-  if (!g_spawn_async (NULL, (char**)panel_args, NULL, G_SPAWN_SEARCH_PATH, NULL,
-                      NULL, NULL, &error)) 
-    {
-      g_critical ("failed to execute %s: %s", panel_args[0], error->message);
-      g_clear_error (&error);
-    }
-}
-
 static void 
 grab_notify (GtkWidget *widget, gboolean was_grabbed, gpointer user_data)
 {

diff --git a/src/shell-global.h b/src/shell-global.h
index 5d2c28d355e97d2f9bc75074c45b95a5b821111d..386afbb0aacdd96b7c2e2051d2adfed8a8d6d33c 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -48,8 +48,6 @@ MetaScreen *shell_global_get_screen (ShellGlobal  *global);
 
 void shell_global_grab_dbus_service (ShellGlobal *global);
 
-void shell_global_start_task_panel (ShellGlobal *global);
-
 typedef enum {
   SHELL_STAGE_INPUT_MODE_NONREACTIVE,
   SHELL_STAGE_INPUT_MODE_NORMAL,